From 0a624b92706c52b3bc4c1acf6d96c008f2779027 Mon Sep 17 00:00:00 2001 From: "sos22@labyrinth.cl.cam.ac.uk" Date: Thu, 10 Jul 2003 09:21:10 +0000 Subject: [PATCH] bitkeeper revision 1.326.1.1 (3f0d3006ZIpQaVRSSN8pEanJ8WPbCg) We don't need or, really, want, to export the domain-side block device number for virtual disks, so don't bother. Instead, we export the mode of the segment, which actually makes much more sense anyway. --- BitKeeper/etc/ignore | 18 ++++++++++++++++++ xen/drivers/block/xen_segment.c | 6 +----- xen/include/hypervisor-ifs/segment.h | 18 +++++++++++------- xen/include/xeno/segment.h | 4 ---- .../arch/xeno/drivers/block/xl_segment_proc.c | 2 +- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index d31998cd62..16bde8a32e 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -439,3 +439,21 @@ xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_block.c~ xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c.bak xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c~ xenolinux-2.4.21-sparse/include/linux/blk.h~ +xen/drivers/net/8139too.o +xen/drivers/net/e100/e100.o +xen/drivers/net/e100/e100_config.o +xen/drivers/net/e100/e100_eeprom.o +xen/drivers/net/e100/e100_main.o +xen/drivers/net/e100/e100_phy.o +xen/drivers/net/e100/e100_test.o +xen/drivers/net/pcnet32.o +xen/drivers/net/tulip/21142.o +xen/drivers/net/tulip/eeprom.o +xen/drivers/net/tulip/interrupt.o +xen/drivers/net/tulip/media.o +xen/drivers/net/tulip/pnic.o +xen/drivers/net/tulip/pnic2.o +xen/drivers/net/tulip/timer.o +xen/drivers/net/tulip/tulip.o +xen/drivers/net/tulip/tulip_core.o +xen/drivers/net/via-rhine.o diff --git a/xen/drivers/block/xen_segment.c b/xen/drivers/block/xen_segment.c index 87d22e04dd..b4ccf0cf58 100644 --- a/xen/drivers/block/xen_segment.c +++ b/xen/drivers/block/xen_segment.c @@ -194,16 +194,12 @@ void xen_segment_probe_all(xen_segment_info_t *raw_xsi) if ( xsegments[loop].mode == XEN_SEGMENT_UNUSED ) continue; - device = MK_VIRTUAL_XENDEV(xsegments[loop].segment_number); - - printk("Doing seg %d.\n", xsi->count); - xsi->segments[xsi->count].device = device; + xsi->segments[xsi->count].mode = xsegments[loop].mode; xsi->segments[xsi->count].domain = xsegments[loop].domain; memcpy(xsi->segments[xsi->count].key, xsegments[loop].key, XEN_SEGMENT_KEYSIZE); xsi->segments[xsi->count].seg_nr = xsegments[loop].segment_number; - printk("Done.\n"); xsi->count++; } diff --git a/xen/include/hypervisor-ifs/segment.h b/xen/include/hypervisor-ifs/segment.h index 99b8700a19..1dc5731097 100644 --- a/xen/include/hypervisor-ifs/segment.h +++ b/xen/include/hypervisor-ifs/segment.h @@ -3,15 +3,19 @@ #define XEN_MAX_SEGMENTS 100 /* total number of segments across all doms */ +#define XEN_SEGMENT_UNUSED 0 /* bzero default */ +#define XEN_SEGMENT_RO XEN_DISK_READ_ONLY +#define XEN_SEGMENT_RW XEN_DISK_READ_WRITE + typedef struct xen_segment_info { - int count; - struct { - unsigned domain; - unsigned seg_nr; - char key[XEN_SEGMENT_KEYSIZE]; - unsigned short device; - } segments[XEN_MAX_SEGMENTS]; + int count; + struct { + unsigned domain; + unsigned seg_nr; + char key[XEN_SEGMENT_KEYSIZE]; + unsigned short mode; /* UNUSED, RO, or RW. */ + } segments[XEN_MAX_SEGMENTS]; } xen_segment_info_t; #endif /* __HYP_IFS_SEGMENT_H__ */ diff --git a/xen/include/xeno/segment.h b/xen/include/xeno/segment.h index 3bbd8b20bf..6e702816ac 100644 --- a/xen/include/xeno/segment.h +++ b/xen/include/xeno/segment.h @@ -35,10 +35,6 @@ typedef struct extent unsigned long size; /* size of this extent */ } extent_t; -#define XEN_SEGMENT_UNUSED 0 /* bzero default */ -#define XEN_SEGMENT_RO XEN_DISK_READ_ONLY -#define XEN_SEGMENT_RW XEN_DISK_READ_WRITE - typedef struct segment { int mode; /* UNUSED, RO, or RW */ diff --git a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c index ecd20acfa4..19b0543692 100644 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c @@ -51,7 +51,7 @@ static int proc_vhd_show(struct seq_file *s, void *v) data->segments[data->count - 1].domain, data->segments[data->count - 1].seg_nr, data->segments[data->count - 1].key, - physdev_to_xldev(data->segments[data->count - 1].device)); + data->segments[data->count - 1].mode); return 0; } -- 2.30.2